Nil load-path elements shouldn't crash Emacs

This upstream patches has been added:

  * lisp/startup.el (command-line): Handle nil elements in load-path.

Origin: upstream, http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=edfdb22f674312389ccf5d5e37efa4d3f1516994
Bug-Debian: http://bugs/debian.org/768751
Added-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 781b3ab972689267ac08feffdf933dc529f1637a..b162ebc9d5444bf7324912fd637530882e0a3551 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-10  Glenn Morris  <rgm@gnu.org>
+
+       * startup.el (command-line): Handle nil elements in load-path.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
        * Version 24.4 released.

diff --git a/lisp/startup.el b/lisp/startup.el
index c4f9f79799034409ec23191b9eb70a85c9dbae0a..1ef2556c380b46b548aa97405b536684da2b632a 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1336,6 +1336,7 @@ the `--debug-init' option to view a complete error backtrace."
   (let (warned)
     (dolist (dir load-path)
       (and (not warned)
+          (stringp dir)
           (string-match-p "/[._]emacs\\.d/?\\'" dir)
           (string-equal (file-name-as-directory (expand-file-name dir))
                         (expand-file-name user-emacs-directory))